Did some TODO's. Including System.printName.