108: Ensuring that we can scale up and down

:pear: @3000