Major work on this catalogiser