Related to #56 (closed)
I've merged !43 (merged) and !44 (merged) in separate merges.
!43 (merged) merged without conflicts (and is all external scripts, I haven't checked if those need to be python3ified)
!44 (merged) required a number of manual changes which have been discussed in !63 (closed)