Add/lint

cc @calvinfo