added wrapper classes but still have issues