Update dependencies

Working on updating dependencies slowly, trying to work out issues along the way.