Moving enums and init around
Moving to load functions universally
Moving to const refs
Merge pull request #23 from martinthomson/sdp_stub

As below