House keeping
House keeping con't
Should be last of the house keeping for now
Working on return types