More ident messing, almost there