TBS move mostly written, just need to fix concurrent modification bug