Cleanup (Already?) and added physics