Syri partcoded

Syncing up here so I can grab it on my laptop to fiddle with.
Merge branch 'master' of https://github.com/Fenoxo/sourceTiTS