about to start deliverable 10 and reorganize code