Added Kodi's stuff
Merged John's work into mine... hopefully