more reorganization of classes
finished logic for turns
Just breaks adjusted
resolving conflicts