Topic/reqs 333

Better to declare this as a Map if possible