Add initial checks in