Reworked a bunch of internals for data events
Updated internals bits
Added internals internally, no more submodule