Mob 407

I also did some code cleanup
This module needs a bit of a re write