Getting windows images working again. Mac is probably still broken post-refactor