move more code into template, wrapup