First cut at sight/image support