-- add test comments
-- up Struct init.