Added TODO and static LLC reference