second commit, full app