part one done part two almost