so should we do this as a different issue/commit?