Agreed. This is just an initial pass; the intention was to get them in and refine via iteration