final commit. fully functional.