revision for a major rewrite beginning 1/1/14