refactoring Activity
Brought to you by:
krodey
Fixed q2
Uploading files.
Uploaded code