Got rid of shared pointers

Those were fukd up...