Added arrays
Added TODO line