first commit.
Ugly lock, but it works.
MERGE & fix.