Update v6, most functions complete, polish might be needed.