Partway through the homework

Working through part 1 - fixing the various IDs to include names