going to remove some stuff
working; need to re-read some code before continuing