lobby almost complete
merge