Testing some changes, better pull master first so I don't have to do it all twice..... Of course master is broken somehow.