More work to move to class structure