Yeah that wouldn't have worked
:lipstick:, refactor some handling, and deal w/ #1