nearly cleaned up...