Groundwork started in main.c for 3.0