Updated to use INT over TINYINT, prevent nulls?