Reinventing the Computer Science Curriculum - Under Construction