Rebuilt System for checking

Added new block check system
Cleaned up code