Final commit, fully functional.