some stuff still not working