Started adding plot functionality