Stop returning stuff; add getters for the data so client can get only what they want.