More scaffolding. Changed a few types. Added CHIDepartment