Merge Progress

I finaly made some progress with this merge I’ve been doing. I’ve actually got everything to compile and the code up an running. Some of the stuff even works! 🙂
But some of it doesn’t 🙁 Null pointers galore!

Still it’s only three days late already!

Ho humm, I guess I’ll be putting in some overtime this weekend.