lint work, bikeshed remaining
git integration work