Changed to Catkin, work ongoing, probably broken a bit