Put the value object within a mutable object

Step 1 -- still WIP