Import pertty much done
Updated doc