about to handin. test2 still buggy