Express/Connect refactor
merge