still cleaning up get/set