core class refactor, url output remaster