Mea ono merge

A few big features, mostly UI-wise, but current development is based in /engine/ not /cur/, now. /engine/ is a sort of unit-testing playground for assembling what I need to get to the scripting bit, which will be in /cur/.