Major redesign helping with memory leaks.