basic stuff done,  a bit more to do.