rough draft commit of using new logic and new class to set unit