efforts at making changes for new class

totally incomplete, ideas in progress