Final commit, all functioning