Moved things away from the main entry point.