I love the approach. With all thats been mentioned. Is it worth taking a small step back and re visiting the flow? Come up with a better outline and then apply the pieces we have already crafted into the new flow?