Added draft of physics and moved a few things around