More work; now can restore color (In preperation for more work) and has (hopefully) a better engine.