Attempt at fixing pimpl - pointer dec, replace w/ vector