Nearly get the core working