Updated AOP system a bit more

Basic system in place. Still need to add the ability to override generic
classes though.