About to refactor and get rid of the spaghetti routing