First Draft second semester

got rid of core module, see email for detail or search through TODO tags
in code