WIP - fix eager font and image parsing