Work in progress - this version is pretty much stable, additional work was done on presentation side.