switches things over to new value object modules

adds FIXMEs where more thought is needed