Fixed returned object tracking code
Added TODOs
Merge remote-tracking branch 'origin/master'