Rework almost all
Desperatly need classes