milestone
commiting prior to more UX changes
temporary push to github, possibly non functional version