Compiles now.  Still leaks memory.