More stuff done (getters/setters and checkers)