Merge pull request #37 from myrle-krantz/develop

Intermediate state so that Mark can start programming against the new…