V2.0 nonbreaking jazzcat

@noahadams could you have a look?