Readding code from a branch I somehow got into