further progress on the wirestub
merged