Almost a complete refactor.  Adding quite a bit of functionality and
removing functionality donated to the Sling Project