Oops! I'll address this as part of my next commit. Shall I use the term "module"?