Starting to work on resolving more of non-conflicting getters