Implemented cat5. Looks good wrt/ paper but cross-check w/ lorenzo if there are more recent changes
Implemented DL and cats 6 and 7. Need to test yet