working sorta
working
fixed merge conflicts