Added basic routing and random key generation