partial progress on vortex shedding
fixed merge conflicts