Reworked local checker and beginning refactoring