initial work on hbs integration and default