Slight TODO modification
Main function updates