TODO Items added

Moved option explicit on