Making progress on new dwell paths
Added moving elbows
Fixing conflict