Initial WIP

See: SLN-677