WIP: Move article wrapper into templates