finished implementing first version of values classes