adding map
merge cft
some janky ass shit