The two PRs created for the investigation here and here will need to be cleaned up and merged. There are comments and suggestions on both which should be addressed.

A PR against this module also needs to be created. This PR should provide the original server history to this new module.