Development

This is my pull request for the app submit!