All of the TODOs from the initial list done