Using object URL's instead of data URL's
WIP - tweaks