I have been unable to find makoto and progress i feel soft locked 

Makoto is in the Girls Dorm.  I may need to change some dialogue to note that better.