WIP - getting the value metrics going