Committing something ugly that sort of works