Commiting Evan's version of the app