Refactored to use all Express power