Removed weird merge stuff
Everything working except double clicks