I deleted this old commented out stuff, if we need it, we'll spec again and implement without worrying about this part.