added some templatey stuff, not ready yet but getting there