Working first draft of simplify