Started on values section WIP