Removed the TODO to add better Error Checking