CJ - upgrading to express 4 and changing templating