Convert to express WiP

Work in progress on conversion to express. Still need to work out some of the testing + logging bits.