commit!
Departments chart finished needs to be refactored
Fixing conflics with ardroiz