Work on GDK

Don't merge for now !