a lot of things still not working, pushing because I've made a lot of changes