yet another pre-testing commit (now with totally new dict-driven logic)