Started updating the source to fit the new spec.