chaning some things around and not working at the moment, not a good commit
fixed bug, should work now