Starting over on testing branch, major Palaver rewrite.