Added in map. Still need to update test.cpp to confirm working