Updating: adding some testing code.