Add consistency checks xcontroller
Add checkers to logic