New shtuffs!
Merge
Fix derp