Support images

DO NOT MERGE
This is the bit that makes image support possible