Lots of refactoring using macros and yard syntax; More methods complete