Progress on #13, working with mock objects
A whole lotta stuff...

$worked 16h on #8