Revert latest changes so stable before make new branch
As new changes will now break alot of stuff