Lots of work done. Charts and REST stuff