WIP invalid input checks
Updating files