Refactor after creating a cancel button...
in the middle of work, commit to pull update from Dan