I (think I) fixed it, with "option two." Thank you, guys!