Pull initial uow stuff into marlin2