Self method + cors shizzle + confict fixes (hopefully fixes:) )