refactor bootstrap to support groups