WIP: Works through scalate-util again.