Updated to part 1 final with design