I'm not near a laptop right now, but can rebase that branch and try to fix stuff up at some point in the next 16 hours