Pulling code
Resolcing conflitcs
Skeleton for the tabs