Fix User model and begin adding avatar functionality