Cleans up Space2D stuff
Fixes template conflicts in Delta
Testing for Delta. Requires Debugger diagnosis. Too stupid to use GDB