Checking in all code. Still a bug with overnight,end-past-curfew.