moving some things around, fleshing out the toilet model. trying to avoid puns in commit messages