Added primitive types. Updated...no progress still