Master implementation almost complete