start on addressing Mike's feedback