Got basic support for puzzle pictures working