WIP for Gst#1.0