More concrete structure in place. See  #12