Revert to initial commit as a lot was done badly