added things for static helper
added tests and such
finished