Done most of it now