Upgraded to using express routing