Trying to merge changes in modeling and get tests working