base functionally commit, app isn't working yet!