WIP - image import

Work in progress, but starting the PR early as I might have Joel / Alex chime in for a quick code review later on