Initial Catkinization

Fixes #14
Fixed.