More mappings (should be all)

Ready for repositories to created now. Need to work out exactly what BL
we want although this can be probably worked through as we go along.
SCREENS!!!