Had to remake nested classes. Will talk to Abdallah to get this sorted out Monday.