added TODOs and debugging statements
added debugging statement