Split out jztweaks to separate files

Also add ipython code.
Resolve merge conflict