changed to 2 space intendation, added ability to register modules for
retrival later on