Added core. Untested