Updates work properly again.  Basically barely using handlebars now, but committing cuz it works this way.