Added a bunch of other check types and refactored stuff