Final commit, commented code