huge overhal, redirected focus to class based processing, there is a lot of work to do, as well as cleanup/removal of the