Beginning merge of front + back end