Began integrating the two sets of code together