Updated with flyout, WIP