Starting to add return type functionality