Began adding memory management, changed some NULLs to nullptrs
Began adding memory management, changed some NULLs to nullptrs
Fixed merge errors