First merge of initial setup into primary dev