Week 2 Work

WelcomeActivity is working, the other two will need revision.