Better glamor system would be nice...