Added TODO's
Added sinks
Fixed a bug that made it impossible to detect field usages