done I think, time to test