Merge current changes I've had hidden away