Currently broken for Glass. Need to fix. Too tired.