Added TODO.
Added eval in two places.
Cant remember if I commited earlier.