so i was refactoring everything to get as little duplicate code and includes as possible when i realised there was a lot i could do, aka there was a ton to do, so no new code, just refactoring and moving old one
merge