Staging some changes from before. Going to work on some other stuff for a bit.