Adding some TODDOs to suppliment memory allocation losses