Partial support for hunk staging (beta!)