Added if(n)def statements to GridNav and Movement