Version 2.0

Nailed it.
much less coupling now