working through. Added more data and graphics source