Handling TODOs

by Vitaly Belman 11/09/2010
1297