Overhaul

classes instead of arrays, first steps