catkinized, updated to hydro (damn you API changes :( )