Yes, I'm trying not to focus as much on fluency. Its tricky with middle school boys, but I will definitely try to incorporate some of the topics you mentioned :)