merge of most of blue-vegas build