First step to adding more checks to code