Don't defer the things. Refs #19

Needs some IRL testing.