wip
wip
Merge pull request #3 from immersivelabs/updatesToOrderAndFixTest

[WIP] updates