Trying to fix my stupid git mess!