woohoo
cleaned up and finally working