Still not right but at least it's progress :/