initial commit on part 2