Lots of changes during last LAN. Commit prior to sorting out streaming (although there are a couple of config things still in there ready for it)