Adding core and whatnot