second try for fixing the catagory bugs
modified merge tests a little
hw1 part 2 specs are done but part 1 still isn't there