Switched to simple Activities for easier programming