New feature almost ready