Commented out broken Code
reorganized code