The big refactor.  It should be easier to add features now.