Update Red Badger Fork

Update with nates latest changes