CORS - suck it!
cleanup and re-org