Checking in my changes

The changes include the 2 new screens