Added basis for adding modules (Needs some final editions)