Almost finished, better tuning for part 1 remains