Update work and add WIP logic to templates