diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp
new file mode 100644
index 00000000..9ca8a7e3
--- /dev/null
+++ b/cockatrice/src/gameselector.cpp
@@ -0,0 +1,131 @@
+#include <QTreeView>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QHeaderView>
+#include <QInputDialog>
+#include "dlg_creategame.h"
+#include "abstractclient.h"
+#include "protocol_items.h"
+#include "gameselector.h"
+#include "gamesmodel.h"
+
+GameSelector::GameSelector(AbstractClient *_client, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent)
+	: QGroupBox(parent), client(_client), room(_room)
+{
+	gameListView = new QTreeView;
+	gameListModel = new GamesModel(_rooms, _gameTypes, this);
+	gameListProxyModel = new GamesProxyModel(this);
+	gameListProxyModel->setSourceModel(gameListModel);
+	gameListProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
+	gameListView->setModel(gameListProxyModel);
+	gameListView->setSortingEnabled(true);
+	if (_room)
+		gameListView->header()->hideSection(0);
+	gameListView->header()->setResizeMode(1, QHeaderView::ResizeToContents);
+
+	showFullGamesCheckBox = new QCheckBox;
+	if (room)
+		createButton = new QPushButton;
+	else
+		createButton = 0;
+	joinButton = new QPushButton;
+	spectateButton = new QPushButton;
+	QHBoxLayout *buttonLayout = new QHBoxLayout;
+	buttonLayout->addWidget(showFullGamesCheckBox);
+	buttonLayout->addStretch();
+	if (room)
+		buttonLayout->addWidget(createButton);
+	buttonLayout->addWidget(joinButton);
+	buttonLayout->addWidget(spectateButton);
+
+	QVBoxLayout *mainLayout = new QVBoxLayout;
+	mainLayout->addWidget(gameListView);
+	mainLayout->addLayout(buttonLayout);
+
+	retranslateUi();
+	setLayout(mainLayout);
+
+	setMinimumWidth((qreal) (gameListView->columnWidth(0) * gameListModel->columnCount()) / 1.5);
+	setMinimumHeight(200);
+
+	connect(showFullGamesCheckBox, SIGNAL(stateChanged(int)), this, SLOT(showFullGamesChanged(int)));
+	connect(createButton, SIGNAL(clicked()), this, SLOT(actCreate()));
+	connect(joinButton, SIGNAL(clicked()), this, SLOT(actJoin()));
+	connect(spectateButton, SIGNAL(clicked()), this, SLOT(actJoin()));
+}
+
+void GameSelector::showFullGamesChanged(int state)
+{
+	gameListProxyModel->setFullGamesVisible(state);
+}
+
+void GameSelector::actCreate()
+{
+	DlgCreateGame dlg(client, room->getRoomId(), room->getGameTypes(), this);
+	dlg.exec();
+}
+
+void GameSelector::checkResponse(ResponseCode response)
+{
+	if (createButton)
+		createButton->setEnabled(true);
+	joinButton->setEnabled(true);
+	spectateButton->setEnabled(true);
+
+	switch (response) {
+		case RespNotInRoom: QMessageBox::critical(this, tr("Error"), tr("Please join the appropriate room first.")); break;
+		case RespWrongPassword: QMessageBox::critical(this, tr("Error"), tr("Wrong password.")); break;
+		case RespSpectatorsNotAllowed: QMessageBox::critical(this, tr("Error"), tr("Spectators are not allowed in this game.")); break;
+		case RespGameFull: QMessageBox::critical(this, tr("Error"), tr("The game is already full.")); break;
+		case RespNameNotFound: QMessageBox::critical(this, tr("Error"), tr("The game does not exist any more.")); break;
+		case RespUserLevelTooLow: QMessageBox::critical(this, tr("Error"), tr("This game is only open to registered users.")); break;
+		case RespOnlyBuddies: QMessageBox::critical(this, tr("Error"), tr("This game is only open to its creator's buddies.")); break;
+		case RespInIgnoreList: QMessageBox::critical(this, tr("Error"), tr("You are being ignored by the creator of this game.")); break;
+		default: ;
+	}
+}
+
+void GameSelector::actJoin()
+{
+	bool spectator = sender() == spectateButton;
+	
+	QModelIndex ind = gameListView->currentIndex();
+	if (!ind.isValid())
+		return;
+	ServerInfo_Game *game = gameListModel->getGame(ind.data(Qt::UserRole).toInt());
+	QString password;
+	if (game->getHasPassword() && !(spectator && !game->getSpectatorsNeedPassword())) {
+		bool ok;
+		password = QInputDialog::getText(this, tr("Join game"), tr("Password:"), QLineEdit::Password, QString(), &ok);
+		if (!ok)
+			return;
+	}
+
+	Command_JoinGame *commandJoinGame = new Command_JoinGame(game->getRoomId(), game->getGameId(), password, spectator);
+	connect(commandJoinGame, SIGNAL(finished(ResponseCode)), this, SLOT(checkResponse(ResponseCode)));
+	client->sendCommand(commandJoinGame);
+
+	if (createButton)
+		createButton->setEnabled(false);
+	joinButton->setEnabled(false);
+	spectateButton->setEnabled(false);
+}
+
+void GameSelector::retranslateUi()
+{
+	setTitle(tr("Games"));
+	showFullGamesCheckBox->setText(tr("Show &full games"));
+	if (createButton)
+		createButton->setText(tr("C&reate"));
+	joinButton->setText(tr("&Join"));
+	spectateButton->setText(tr("J&oin as spectator"));
+}
+
+void GameSelector::processGameInfo(ServerInfo_Game *info)
+{
+	gameListModel->updateGameList(info);
+}
+ 
diff --git a/cockatrice/src/gameselector.h b/cockatrice/src/gameselector.h
new file mode 100644
index 00000000..4a178bc3
--- /dev/null
+++ b/cockatrice/src/gameselector.h
@@ -0,0 +1,41 @@
+#ifndef GAMESELECTOR_H
+#define GAMESELECTOR_H
+
+#include <QGroupBox>
+#include "protocol_datastructures.h"
+#include "tab_room.h"
+#include "gametypemap.h"
+
+class QTreeView;
+class GamesModel;
+class GamesProxyModel;
+class QPushButton;
+class QCheckBox;
+class AbstractClient;
+class TabRoom;
+
+class GameSelector : public QGroupBox {
+	Q_OBJECT
+private slots:
+	void showFullGamesChanged(int state);
+	void actCreate();
+	void actJoin();
+	void checkResponse(ResponseCode response);
+signals:
+	void gameJoined(int gameId);
+private:
+	AbstractClient *client;
+	TabRoom *room;
+
+	QTreeView *gameListView;
+	GamesModel *gameListModel;
+	GamesProxyModel *gameListProxyModel;
+	QPushButton *createButton, *joinButton, *spectateButton;
+	QCheckBox *showFullGamesCheckBox;
+public:
+	GameSelector(AbstractClient *_client, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent = 0);
+	void retranslateUi();
+	void processGameInfo(ServerInfo_Game *info);
+};
+
+#endif
\ No newline at end of file
diff --git a/cockatrice/src/gametypemap.h b/cockatrice/src/gametypemap.h
new file mode 100644
index 00000000..fce16175
--- /dev/null
+++ b/cockatrice/src/gametypemap.h
@@ -0,0 +1,8 @@
+#ifndef GAMETYPEMAP_H
+#define GAMETYPEMAP_H
+
+#include <QMap>
+
+typedef QMap<int, QString> GameTypeMap;
+
+#endif
\ No newline at end of file
diff --git a/sounds/cuckoo.raw b/sounds/cuckoo.raw
new file mode 100644
index 00000000..52f0cbb6
Binary files /dev/null and b/sounds/cuckoo.raw differ