Started fixing everything user related