back to go templates, lots of changes