Refactor and start on new router