Rework modules to use agreed-upon interface
Merge branch 'master' of github.com:forestbelton/spaceshit