Adding module functionality
Save before scary testing