Reorganize, add gauges