Added stuff to logic.class