Major overhaul

Class #4