Small progress with type parsing