Total remake of entire class structure!