Merge pull request #53 from justinxreese/ttm

BUTTS
Merge pull request #54 from justinxreese/carol/ttm

Butt fixing
more butts