Refractored code. Begin removal of ExpressJS...