Some more work
Dangit dmod! :P