Freud-style way of handling shared pointers

I've fixed a couple minor issues and tidied this up, otherwise it looks like it should fix the memory ownership issues we would run into otherwise.