update13

getting back to tests, better take this slow