Resetting master to get rid of old changes. This isn't the cleanest branch I've created :)