Value -> Box refactoring WIP