moving th loaded modules to the template; minor refactors; playing around with beginning to add test coverage