Update deps
Major rewrite and simplification.
Up version number