Fixed stuff, need to add authorization