Milestone 1

Fixes, Addes, everything
Milestone 1 - Part 2
ddd