Ugh... made some changes that I'll probably change back.