Prep for random (someday)
Remove "display" logic
Oh pervical