There are many problems with the way the current version is provided and maintained. This commit or series of commits will fix this.
Crealned up some TODOs, FIXMEs etc. Added better error handling. Looks better, feels better.