gonna merge anything jason did
fixed merge conflicts