Adding more boilerplate for tomorrow