diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
index e0728fa..f343491 100644
--- a/src/widgets/mod.rs
+++ b/src/widgets/mod.rs
@@ -95,8 +95,11 @@ impl BigRedButton {
   ///
   /// I haven't figure out what will receive the on-press events, so I'm moving
   /// the problem. It will not be the button's job to hook up the event notice.
+  ///
+  /// TODO: Pass in the UiTheme struct 
   fn bundle(text: impl Into<String>) -> impl Bundle {
     (
+      // TODO: Remove `Button`? Add `Button` to the `CloseButton` bundle?
       Button,
       BigRedButton,
       Node {
@@ -182,8 +185,11 @@ pub struct CloseButton(Entity);
 
 impl CloseButton {
   /// Spawn a button that will despawn the top-most node when pressed.
+  ///
+  /// TODO: Pass in the UiTheme struct
   fn bundle(target: Entity) -> impl Bundle {
     (
+      // TODO: Add `Button`? Remove `Button` from the BigRedButton bundle?
       CloseButton(target),
       Node {
         width: Px(20.0),