First version of the staging feature