Account for no function keyword
Implement some more commands for vim mode