Removed TODO - issue has been made