Added memory manager
8 files changed