Second day's commit. Some structure.