Mapped Sh (needs cleaning), Whitman; added various util funcs