Finish making the work with button conditional depending on states
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp