Another messy commit

I may make these commits cleaner in the future, but for now I am
changing a lot and experimenting with new plugins and whatnot.