Wip overall rework
Updated framework to 2.4.0
Reworked engine
Done building module