WIP - fixup drawing using rendered surfaces