Added modules first draft