Started in on the painful template refactor for #66 and cleaned up some Filer stuff along the way.