things kind of work again, need to fix a lot of code