Mi wood/team handler support

@beso323 @jsm includes fetch from upstream