Almost Done

Lots of changes