Still working on mapping the user