add getters and setters back in