Added todos to deal with malformed equations