Current Update for 2.0

Currently working on version 2.0 first push