Azathoth: Next couple of months, before I move to Canada. It's already been done, I just need to find the time to test it and update it because I've changed the framework code since then. I still use Include which may seem dumb but I have the Quick Build option turned on which helps a bit.