Fix engine (& MVPaa)

Merge broke engine, so I reset the engine with Tibor's original
devel-share engine, which works. Added some custom functions from sasha.
Ready to contribute code to devel-share now...