Add aerodynamic drag and restructure for cleaner physics