adding more code

still in that phase where I'm adding a bunch of code, fleshing out different structs and getter/setters