dev/partial-paths

Similar to pull #115, different implementation.