move class out since there are some odd classloader issues there