created some more code seperation, if not cool let me know and I can undo the changes in like five seconds