Can this be the last new feature of the project?