Lobby refactoring, pt. 2