Refactored out a border system (Strategy pattern)