Filling in getter methods and some other stuff