minor change to model
deleted model
changed types in interfaces to only reference other interfaces