model updates and employee->contact refactor