adds todos; cleans up phone regexs
cuts models