finish adding backwards compatibility, tests now passing