DONE with catkinization of this repository