Revert "Pulling from Wills Development"

Reverts crlyli/ungmap#6