Added a few more classes for lab2