First pass done. There's still stuff to be done but I'm stopping here and we can open some new issues to improve further.