added first pass at subject map