added two getters, needs a lot more