Beginning to fix method return types