did absolutely nothing b/c I'm useless
Working on land mines
fixed merge errors