Clean up, Working version, added department information and term infomra...

...tion