Graphics added. Final commit