Some major refactoring.
Mainly, converted map to use the getters/setters model and move towards the uniform access principle.
Finish refactoring into a uniform access system.