Commented out a load of stuff