Mucho changes to get colours and pie charts going

Still so mucho to do