Besancon refactor

One of the last few modules to be refactored.  I need it this week, too, so it will get pulled soon.