I'll run some tests and see if the getters/setters can be removed without impacting functionality...