more screwing around with vlc
adding vlc changes?
Table needs to be fixed
Merge branch 'ch00f/codemerge' of https://github.com/occams-chainsaw/wave-tag into ch00f/codemerge