Huge update. Added lots of new tracking and php