Created a tools class and started moving things to that. So many shared methods, too much messy code.