Data Struct almost final