It might be a good idea to base an experimental branch on the JJS branch and try to keep the engine somewhat working on different platforms. If both branches are in the same repository, it's easier to make sure that bugs that are in both branches get fixed in both.