Added plotting...not working yet