Collection Mode is now mostly working, mostly...