Updated User Flow
Merge http://github.com/naimath/wagonlift