Rebased commit... stuff deleted and stuff merged into this commit trying rebase :)
Merge fixes..
Rebased and master commit now...