No longer use SOLID

Ask Sam for explanation