Some work on #576
More work on #576 (make driver)
Merge branch 'paths' of github.com:nddrylliog/rock into paths