Re-integrated AOP into K2, needs a lot of work and testing!