Final commit, fully documented