Temp commit. May be revoked.
Fixing lint errors.
Updating todo.