Finalized buttons and recurrsiveness
Fix merged confict
Merge pull request #969 from ahomatthew/develop

Develop