Half done core / config stuff

Stopping at weird error!