Edited acouple errors in the std::pair logic. Will continue to test and finish up within the next day.