Got it working again
Merge branch 'refs/heads/wip'