move mako to handlebars and add sub product