finished! hopefully. works on Aardvark.