-- have update working; just need to fix tests