Massive Rewrite Now Includes EventFactory :)