seems to work now. need to check special stuff like plus and dynamic reload
also need to fix deprecated stuff