Adding charts. work in progress