Fields are taken care of, could use a little more ...

Fields are taken care of, could use a little more grading but good