Finishes up the final main TODO