fully functional, final commit