Revamped some templating, still crude as hell