Refactor second half of DoShutter - test DoShutterAction

[evanmayer]

Please confirm that this refactoring does not change the logic of the old code. It should just make it more decoupled/easier to test.