Move to express

Not 100% done, but more or less everything is here