More integration work

Yes, I just copy + pasted code from my repo: FF2-Alpha