Work on formatting and user flow