Got the full flow working