Long-lost XUIKit push from last year ;)  Helps with #1