Added more features, closer to the grader given to us