Moved some stuff in to config.