MERGE FINAL W/ ALL THE SHIT

ALL THE SHIIEEEET