Add uniquify, clean up image polling for gaming, working on deletion/insertion