Big Changes

Removed passing information via intent.
k