updates to classes and add tests for mapping
Merge pull request #32 from immersivelabs/order

updates to classes and add tests for mapping