Removed old mess
Finished ex 2
Needs fast review but otherwise done