Add new method, and fix some TODOs
Implementation of method ToString