Merging Initial Skeleton Code