Premerge commit. Working on tests
Merge commit. Work in progress.
Going home