Move more code to modules. Use a different gauges account.