okay, that did not work as well as I hoped. TODO: full engine re-write