Changed around, remaking parts of old classes