Added TODO
Added verb components