reworked_codebase

this is the current updated version of the code after merging diverging branches; all branches from now on should stem from here

The assertion is commented out here..

assigned to @psynak

closed