Still missing some but thats a little better