Edited a few different files to prepare for fetching the current user