Better waiting for the bookmark button to be available.
Moved most of 26785 to an EME method.
Merge pull request #253 from roydude/v1-train

v1train