WIP Testing and implementing value expansion.