debugging finished, need for cleanup still.