Move modifiers out into the first system
Move boxes out into its own system