Reworking the queries in the model files and added more functionality to the user class