seventh commit, all functions completed