Cut isn't working, so let's commit for good measure before refactoring