Ripping out sunset sunrise for now,

Getting to a starting point for more distance stuff.