rewriting aop branch for 0.6.5
progress on rewrite for 0.6.5, only insert written and still failing tests