Moving static to a better place