First commit, app is begining to take shape