working more on getting modules sorted out
re-worked the way modules are added -- not sure if its any better yet