Added lots of stuff. Including TOR and ATL