Fixes thingy- not done yet