State update and improvement.
Finished with physics-test branch.
Merge pull request #1 from jasimmons/physics-test

Physics test