So I finally refactored everyting into multiple classes in my branch. It's either a drastic improvement or a drastic disaster.