Cleanup and add lunchtime work