Start working on adding getters and setters