Clean up
Add physics controls