Got to a point where admin seems to be mostly working