Update add/remove token code to work before view is drawn. Close #7