Final commit, commenting complete