initial commit. Much cleaned up.