Catkin-ized. Switched to programmatic loading.