started fleshing out a few of the classes