Move extra user functionality into a seperate class for now.

this will most likely change later