A lot of changes and COMPLETE!!!
Tying up odd ends
..