put bars together, fixed first flip problem
fixed merge conflicts