start working through some feedback from Jacques