V2.0

Reforking so I can make more changes