Comments + code rearranging.
Pass in file name to load.