working on flow and user screens