Initial commit to make Jenkins pass

Fixes #2