this is much cleaner

merge this puppy!