Added basic staging/unstaging functionality