Marshal, reimplemented from the ground up around security