now includes optional git tracking