Preparing to combine functions

THIS IS A GOOD REVERT POINT IF I SCREW IT UP