Reverted changes from last commit that I needed to do. Everything is back to as it was. Still have the memory leak.