Major refactor. Using getters now.