updated combining methods. major overhaul
finalized location merge