6th attempt to do something useful with this bloody horrible version control system