First commit of Catkinized code