WIP as I slowly merge my old & scattered svn backups into git