Version 40

I think just a couple more hours and this will be in a good state.

I should take a break, but I am in 'the zone'...