Adding plotting capability - not working yet