Version 2.0

Cleaned up and commented out