Cat 007

Hello, I think I'm ready for CAT-007 to be merged to Master.