(Marking this as something I need to revisit.)