Add some comment markers to more clearly delineate what different parts of the

code are for. Also add a note that the import * at the end of the file should
eventually go away.