thought I would remove the dsm's as well, but after the fact 'cause who doesn't like commit messages