Merge pull request #968 from ahomatthew/develop

Develop
Finalized buttons and recurrsiveness