Made a complete version with all modules in one. WIll attempt to modularize now that this works.