Checking in before I get into the particle stuff

Also did some clean-up