Final commit on Jan 17 friday night

Have to resume work from assumptions and dependencies