Further development...
Add lints