made a wrapper, moved stuff, fixed tests