Still partly messy

Needs act submit cleanup, but this is a partial integration with
Marcus’s submission method.