Trying to get tabs to work
fixed conflicts