First draft merge - May be unsafe
Working input
Merge pull request #1 from cplepel/Physics

Physics