Need to clean up ripple, back to basic physics