added todo for return change
started consolidating get functions, saving unfinished work