oh right i forgot. i have some unreleased changes in both, since you forked it mid-development, and was running HEAD of both locally.