WIP: Replace more pointers with std::vector
WIP