Moving on to two Activities to separate things a little