agreed, hence the "Fine for now", just tagging the line so that we can get back to it during the polish stage