Don't Edit Other Activities!... It's
screwing up stuff and giving conflicts.I have modified code that I
havn't committed.