Working on fixing templating, getting things in a less crazy state. Very WIP.