Updating TODO
Adding printf as a method for debbuging
Adding javadoc