Express implementation now seems all ok
TODO