started to refactor granular stuff to a kit