Lots and lots of tweaking, and organized files