Features frozen working on commentary