Merge pull request #29 from willtsay/tommy

Tommy
everything works
fixed merge conflict
Merge pull request #30 from willtsay/e7chun

everything works
removed object display
Merge pull request #31 from willtsay/e7chun

removed object display
updates