Improving the core things system. Overhaul in a new dir.