solved-ish?