Develop

Tested on my block, develop branch appears to work without issue. Please double-check. Would like to deploy this into utilities asap.