finished making fit into class structure