Added some tooling and made handling list classes safer.