blerg, adding extra stuff that I'm probably going to remove shortly... committing to swap machines.