Adds basic impl for images; fix