Reorganized to match ISET a little better and allow for use of Otype call