Committing Ariel Keller's app with my additions