Version 2.0

Nailed it.
really cleaned this up