All but done...a few cases not working