More work on core, although think it may be better to start again from scratch.