Move to Jcontroller

Fixes #2