Part of this involves using more shared pointers and vectors (as opposed to arrays) as certain member variables
    Some of that has been done, some work may (probably) still needs to be done
    It's been a few months since this has been looked at so it will require some review

This is a bit of a mess right now