Buffet is open! New modules.
Merge branch 'dev'