Trying to get modules straigthened out.