Completed the merge ater the fuck up branch shit that created this mess