are in the trunk, and I've also put the calls to them in the correct files. The problem is that, I don't understand how some of the C++ code is working, so I just left the code as is for the most part.

So, there's a lot of files that don't compile now, but the basic memory management stuff is in.

I think all that's left for stage one, is simply making it all compile together.