basics working
Cleanup plus a little work to meet RFC-002
Merge pull request #76 from mostarman/master

Implementation of RFC-002 of Team Black