Adding graphics. Still in progress