Added some Memory Leak detecting things, need to find this leak.