changes

made some changes, got it all working, more changes, broke everything