Reverted to using ejs and added Contam to the comprehensive