Updated to use ExpressJS