Intial work on moving template structure to shortcodes.