Deliverable 2 almost complete...

only a few things left to do...