Too many changes to list. Sloppy commits FTW :/