so functionality added -- need to redo gui