Version 2.0

Nailed it.
This is much more readable