Upgraded all deps.
-- Refactoring, working commit.