Mostly working; still working on remove