Changed around file structure, and seems to work with everything as comments will see what happens when code actually removed