move thigs around
fix bubble up