More incremental update on changing access to data members and adding getters / setters.