added the last of the screens - still need visual work