Fix class, add the basics.