The user flow is almost there