final commit. everything is ready wwoohooo