String additions and TODO.