Pull in getters and setters from @leighnt's repo

Any direct manipulation of member variables (properties) changed to getters and setters IAW the Lab 11 requirements.