Updated and running to part 1