Milestone 2.1 Update

Alot of stuff changed