Full rewrite of my private internal C++ framework