I added all the regular ImageSpace stuff, but not our customizations yet.

Signed-off-by: REALDrummer <conman.davey@gmail.com>