Added missing argument
Don't think I need the cursor hack anymore.
Added vim status
Cleanup, added class, and removed task.