HOLY SH*T I CONNECTED TO FB
fixed merge conflicts