added some stuff on evaluation to logic, gonna do some testing