still working

Per your request.
Still need to check em thru.