significan progress building machinery for removing constants and unifying