highly experimental POC - UNTESTED! :-)
A minor fix - we still have a highly experimental POC
Complete reengineering