Refactor story code, also prep work for modals