A lot of good changes again :) Seems like implementation is done.