Something's still not right...
made progress