Filling in TODOs, Fix Missing Names