drop in some extra helper classes