d
debugging and cleaning to do...