Start with moving code into a popup component