a lot of it is .. there are still some open questions more. so i suspect this was a merge conflict with master