refactor some stuff to use sevencommons