Nightlife branch ready for testing