First pass at converting to next-express