Continues work on Mad lib refactor