Refactor 2d

Ready for merge.  Lookin at you, Caswell
We should either nuke all of the `__author__` entries or replace them with BNL