FULL MAIN SYNC

Commit all my shit, errybody sync