todo added
cleaned up
removed debug code