Fixed addition but using getters, have to refactor