Redid the whole thing from scratch