Started adding a better flow to things