Started on catman command
Merge branch 'anurse/catman'