Added method TODO, began implementation