Correcting types
Unfcking types a little
Fixing up stuff
Moving stuff around
Merge pull request #27 from martinthomson/sdp_stub

Much