Part 1 working and clean