fix merge conflicts
Overhauled this entire thing because I am awesome. You are welcome.