also, extend the unit test for it. (*phew* that was much more fun than appreciated because of all the index shifts. I'm still not 100% sure that everything works in all corner cases, but at least my confidence is at 95%.)