Nature AOP basically done. Need some refinement.