Revert "Revert "Expanded derivation functionality""

This reverts commit 1b77e27f4dedb66c57f862ac4692aeb2585fdd55.