Fleshing out the app just a bit more