Changed main module, some additions to supporting modules