Finish Modularizing Add-on