Got it to working conditions, still have to check for mem leaks and see
if I can run more tests
Still seems to work