[Master] A couple small changes before I begin frameworking
[Framework] Begin writing event framework.