Actually fixed the todo this time