X2 Feature Requests

Ok, I’ll look into this!