This is great, I love the idea of moving away from shortcodes and keeping design to code.