Improve ChunkSender

Don't hardcode!