Rebuilt everything from scratch. [NOT BUILDING]

Removed parameters and operators, replaced with lambdas only.
Still not building.