Fixed compiling errors with std::pair additions. Working on logic now.