V2.0 nonbreaking jazzcat

@johnboxall could you have a look?