More changes to stuff, experimenting, not finished yet, wont work