Began work on ability to add modules